From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 11 Jan 2004 21:50:12 +0000 (+0000)
Subject: * alloc.c (allocate_vectorlike): Surround calls to mallopt with
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24521
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7b6f52e3242537383f4d9fd5df68dbedeab52afb;p=emacs.git

* alloc.c (allocate_vectorlike): Surround calls to mallopt with
  BLOCK/UNBLOCK_INPUT.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0dcc0f786fe..b2dc4d5fd07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* alloc.c (allocate_vectorlike): Surround calls to mallopt with
+	BLOCK/UNBLOCK_INPUT.
+
 2004-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
diff --git a/src/alloc.c b/src/alloc.c
index 1835d2a59eb..91fade83609 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2498,7 +2498,9 @@ allocate_vectorlike (len, type)
   /* Prevent mmap'ing the chunk.  Lisp data may not be mmap'ed
      because mapped region contents are not preserved in
      a dumped Emacs.  */
+  BLOCK_INPUT;
   mallopt (M_MMAP_MAX, 0);
+  UNBLOCK_INPUT;
 #endif
 
   nbytes = sizeof *p + (len - 1) * sizeof p->contents[0];
@@ -2506,7 +2508,9 @@ allocate_vectorlike (len, type)
 
 #ifdef DOUG_LEA_MALLOC
   /* Back to a reasonable maximum of mmap'ed areas.  */
+  BLOCK_INPUT;
   mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
+  UNBLOCK_INPUT;
 #endif
 
   consing_since_gc += nbytes;